Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Jun 2011 17:29:50 +0000 (10:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Jun 2011 17:29:50 +0000 (10:29 -0700)

Trivial merge